Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <[email protected]>
Mon, 31 Aug 2015 16:12:27 +0000 (12:12 -0400)
committerTom Rini <[email protected]>
Mon, 31 Aug 2015 16:12:27 +0000 (12:12 -0400)

Trivial merge